Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Thu, 7 Jan 2010 13:54:07 +0000 (21:54 +0800)
committerJason Rumney <jasonr@gnu.org>
Thu, 7 Jan 2010 13:54:07 +0000 (21:54 +0800)
commit3f5620311ba3da207d6e25141f4102fc230ef006
tree19c17a3ff40dd3ea94a66c6ad3b297f09fdd9f61
parent05d25919eafa95a2909d8e2565d01b0dbc207b30
parent05f2680807baae597a2cee2cc643938f7c21a670
Merge from trunk